Merge 3a5461f375c7ff0a98e07fe5aa892a3de131acca on remote branch

Change-Id: If623c031af5a06dbda70a082ec09b85c6293ad4e