Merge 7531248d8e103f292d4bdcbfb1916cf78b152532 on remote branch

Change-Id: Ia68e1b8e279662943b7d05ac82093946849afb68