Merge 9b122201217aee21028fee26e54eafd8a25b13d5 on remote branch

Change-Id: I6c655de0ced850275a8df8f41a9463a0f230dc92