Merge c80db09d6d7a749cf2eb02e4a99621762ab49f17 on remote branch

Change-Id: I8fdf1a2fc8c184a5f02060e64bf3bdb6b106d855