Merge changes I5b3833d0,I7836a013 am: 433e5a8050 am: 23e884ec2f
am: d111c1113c

Change-Id: I169cf78a1f74a0b6cda959523cb181179a8044f5