Merge 0333486c6347689e792eee0eae208a14146c378c on remote branch

Change-Id: Idd172791b2c26f126cc2c4fdfa905a9266422163