tree fc8354838b8943e2bfd623731752402f4ea3d649
parent 7d0107f1b4fb26c6cb87618b62463ea9867066d7
parent bd98feb0021f5693c7830874f316c44cf45585b7
author Bill Yi <byi@google.com> 1526798470 -0700
committer android-build-merger <android-build-merger@google.com> 1526798470 -0700

Merge changes from topic "am-792fee99-89ff-4651-b665-815beee11f86" into oc-dev am: 39630215fc
am: bd98feb002

Change-Id: I329b0ca41e24140ce0a9d90d0fcf04aec1396d92