Merge a2a96d47281bb319324c310ba87a6ae5ca052d04 on remote branch

Change-Id: I2cc24a9eeff9adc91737eff7bab91715cf487333