Bug: 167588565 Merged-In: I27a66e24702f3a8a96b213e4680e20e8be35e477 Change-Id: I9ca8969034d7634e3e8535608f75285e50fb512d