Merge changes I66e40b4b,I599a2ff9,I7c210623 am: 127421b2d0 am: 196af9bd14
am: 4778663ae7

Change-Id: I01b17de0482d9ea7d1bde5579cd707168e499cab