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

Change-Id: Ifb65c3491184d125a0a9a45d51980c48697d6e41