Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f

Change-Id: I97ae5e12a900f38e8271455e48e92bdcf0708b34