Merge changes from topic "b69050941" am: 37eb97d911 am: 864a1baa0f
am: a8fcd9060d

Change-Id: I61bd9960c9e240f427a84190d195c1cb59befaae