Merge commit '3f3ed24' into stage-aosp-master