Merge from master of c263810b08 Bug: 2883736 Change-Id: Iec4ed0e320d67aee8a89092ac650c0960540057b
c263810b08