Merge "Update comment and make change backward compatible." am: 176fca7d51

Change-Id: I2cf216d73a106b5e6bc6c036f504368dfd247ccb