Merge bee24aad2cb523faa6d2f37289efeb5fdb0f74b9 on remote branch

Change-Id: Iebfa46e1b5750b123bea89f349b88190f85bb891