Merge 136d552ee9f6886e52864973141e8c9aed30ae08 on remote branch

Change-Id: Ief1216d45205970c479ca8c66050579e9a9f1ff2