Merge changes from topic "b36424585"
am: cc22f72529

Change-Id: I4186ca07b64ae3c7bf52684a5d559698d491feda