Merge changes Ie5b66d6c,Ia1004ca6
am: 78ccbf5596

Change-Id: I7aa61c32a2d49e6fe917c7be3b784543d33e48ff