Merge commit '5e1ea7c087a5fac80985b64d6ec19c16be1e06b1' from oc-mr1-dev-plus-aosp into stage-aosp-master
am: 609bc28734

Change-Id: If80ed7dcf1a756abb731eb0d79d0acd0d02b8897