Merge changes Idf48f45f,Id2a72fe7,If83e1df2
am: 2be7eb9161

Change-Id: Ie5836fda3e432aacea66c1b63cb3a87fac439068