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

Change-Id: I97e98da931752c6267d0590ecb8b2ecffc3d603c