Merge changes I368d3a56,Idb769991,Ia158b6ed am: 215d1d510e am: ac1cd6550d
am: deda125aad

Change-Id: I77538c0a8bfa718d86d038e6d70bdecd6883b1c3