Merge 52b986bb59794db0c3efcdb67e25d77252ce90be on remote branch

Change-Id: Ifd7aa56c12d1dcb1b8f5169cc926a99975e432a5