Merge cfa93bca0abe4f58a1878363797bbbe1c87bb335 on remote branch

Change-Id: I3434966004f722c6e7be55908cc707b0c67d580b