Merge changes I5e3f6677,I94665a41 am: ce2a8e5b9e
am: d5045947e7

Change-Id: I58468acb434aed4626a01a97ad360359138b6d25