Merge changes I2ef3737f,If080281f am: bb3de35e5f
am: 18a93665a0  -s ours

Change-Id: Ic8b4862eca342e5b9705c16879d800005a2291bf