Merge changes I9f36cc26,I06561ad0,I42c2a8d0 am: 3a38310476
am: e5e5bccd40

Change-Id: Ia1f891df6366514565dcfcd82521024b71722015