Merge 7567acb51c70904db237306f591e7b881dc5dbe5 on remote branch

Change-Id: Ie8b826b39a2fc22a2b9e174132c5fb48cea16637