Bug: 28748264 Change-Id: Ibc59e7f31afa4646fcf048eececb87437dd83de9 (cherry picked from commit 07f468f1)