Merge 747e9cea28416f0a7c993b7f750a2acc14add6a0 on remote branch

Change-Id: I7014453cabadcd7d71ddef854feb6e5300bbc579