Merge "Update the description of getWaterfallInsets()" into rvc-dev am: b578ddde am: 9f4ea365 am: 32946b39 Change-Id: I9a692b30e6e42ab170f0ccea80cad574d66ed501