Merge 19e9faf84bef7856d7189e5d27d71930d6288431 on remote branch

Change-Id: I88f66ccb6b0cf399539f814b6c1bc8540b0e6d09