Change-Id: Ib1ba356e994a98712e00a11ff045df67fbe4c7ea Closes-Bug: #1650204 (cherry picked from commit f2ace0415d)
f2ace0415d