Merge changes I4bdadacc,Ie1f8da1a am: add7d14341
am: 0307508c84

Change-Id: I8d60e57e2c353fcd024e6bf0035b34eeabc71ffe