Merge changes I5e3f6677,I94665a41 am: ce2a8e5b9e am: d5045947e7
am: 68233b1303

Change-Id: If6054f76e68ca025aae5fd5f55fbd33fe7b5f872