Merge "Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD" into nyc-mr1-dev-plus-aosp
am: 6a24e97505

Change-Id: I1a30f0c6f327df1e7b1525ba527b155cdcc66adf