am 7d0f2f41: (-s ours) Merge commit \'30594f22\' into stage-aosp-master

* commit '7d0f2f41453900df49570c8fbc03710c54ed43c6':
  Now doing development for API level 23.