Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6
am: c201a6bb7d

Change-Id: I3459188afc5a6d650e7f4e1a9b03e0b8edfbde71