Merge commit '4ce8956d8836b664aa844ead396f5952c2098ae9' into manual_merge_4ce8956
am: 3c5f84bbde

Change-Id: I4fbb2987d15cf3b7225365a62a99dc5842116805