Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD
am: 6b6ad04934

Change-Id: Iff761d6d6c66098f589a6d162c17867ab18efe72