Merge changes Id51dcb18,I2517dcb9 am: 4db472b779
am: aa3c3fc3be

Change-Id: I095bdeb2621fc49c568d3f7ada8e1abdf688e008