Merge changes from topic "b127336441" am: 9b07b1ab41 am: b7e98cd863
am: 5eb1cf30ac

Change-Id: Iff0f68870047f96523aee71023c7d89ce3c887e7