Merge changes Ia3ec6198,I211696c8
am: 9cbb19d0a8

Change-Id: Id6bf69626cf3d2c52980cb2f55b5121f3746e5fe