Merge 121780444fa543ee7f310900ea22ff1a64aff6e4 on remote branch

Change-Id: Ia7bfb6f872ed8d8b76a4b6fa7fff223f99d77d72