Initial commit from c40226f06464296fdbb72dcfd6052c16166c4157 Change-Id: I438282de6724b30b5471f97b760953f27f05d15f