Merge 592af6d8e69046b747bbe851b69dd1b2e28b033c on remote branch

Change-Id: Iebe81d7306887eebe5d5486c9e54311720ea2a57