Merge 00d05a697cce6effadb7dade064ada803fe82604 on remote branch

Change-Id: Ib8e67a230f29f91f99b45a38518bb7032b0fdfbc