Development to master merge.

Use the latest current available API for targetSDK if there is no any project specific restrictions.