Merge changes Ib29b3920,Ice5efad9 am: ea07a65281
am: 4b2e765b40

Change-Id: Id6e7f57c04461f279eea0da7b67e2f5fb1fbc221