Merge commit '88a9bc0d985a5f0cdb0c2167e0172693aa829563' into manual_merge_88a9bc0d9
am: e391721888

Change-Id: I7eef4faa5c3f1003f17eb6107228d2b7ef2bd551